made more relevant for 1.6 release