master: mods to helper functions