Update

Made a few changes for 1.8