Major overhaul of replies