Continue working on auto-shifting (not done)