a couple rules put back to prior logic