working on migrating to 0.6.0