removed more elif statements