Add a wee bit of logic