Updated for 1.7.2, not done yet