Revert 7ab0c58..e093897

This rolls back to commit 7ab0c58757e95bc3ff5f0d818a064855f3bf7052.
Rollback to my last commit and add error sound if incorrect