Added elif statements