Moving this out of pk3 system