Adding all of the latest changes