Begining 1.7 update