Added more else if statemnets