minor mods
minor mods