default.xml overhaul 2