Changes for version 1.001