Major overhaul from review actions.