Made some changes to the HKSP