Pc edits

merging feature branch into master