Updated to 1.8