change order and unless to if