Changed from using an if else waterfall to just or
it all in one statement