Copying 1.7 code to 1.7 >.>