Changes for version 1.011