Updated for 1.7.1