added more else statements