Doc overhaul