massive overhaul for publication