Changing up a bit of logic.