some modifications to make scripts less tied to my codename (pj)