Added if-else and if