Updated to 1.7.0 (2)