changes to nkihils stuff