Update for 1.8!