Commit 17

Fixed really fast switching.