Updated to 1.7 (HAS ERRORS)