Probably not possible to get rid of the conditionals (revise comment)