fixed migration
further changes