Major changes to structure of the guide