Language changes + addition to guidelines