Copied over all changes I made