John changes 12/17