begin migrating to 0.6