Added a few if-else questions