WIP: more careful reading / mods