Fixed Routine Issue
Pulled from caleb
Pulled Calebs Changes
Pulled uptodate