Switch machine and type around in create for better consistency across commands