moved old into the if