Added A&E
Updated defaults