Changes to the settings -- Commit 43

Trying if-else statement instead of while loop