Updated a few of the important parts