Updating 1.5 through 1.7