pc-branch1 changes

first pull request. horaaaaaaaaaaah