Updated to Version 1.8