Overhaul in prep for publication