Changes to update for 1.7