1.7 Update

I reverted the derpyness you yelled at me for earlier. Works just fine now.