Updated and moved some things around