Deleted autoShift, added safety feature