New changes for version 1.6