Stopped the elif strangeness