minor mods to full