removed elif