default.xml overhaul 3