removed elif dependency