Major overhaul of nest