Updated to 1.8 develop