partial commit for PC (unfinished)