Changes from macpro at moto