Addition of new content, moved some things around