updated changes for 0.02