Updated for 1.7.2 through 1.7.4