Edits to /536, /537, and /549