change how conditionals are done, because KISS