minor mods - probably broken, but testing