Updated for 1.8