totally updated default.xml