updated for new version 0.6