add switching slots back in
Merge pull request #1451 from edisonout/savingfix

Add switching slots back in