Added the auto make stuff