updating following feedback from PC