Added a bunch of extra stuff