1.8 Update

Updating to 1.8