Machine is now updated in the data migration
Updates to datamigration 0011
Fixed merge conflicts