Manual Mode: Further improve state changes