Updates and tweaks before sending it off to Michael