Finished the port to 1.7