Removed k-4pcs from this commit to split up the pull request