Updated for 1.7