Updated for v1.7 BETA