Changes the primer locations and added some backward compatability code