Updated for 2.7