OC-5990
committing more changes to this story