Get rid of the conditional, probably best to isolate these eventually