small mods to get functionality