Updated source to 1.7