Added agreed upon changes to the guidelines