Added XML saving to all 3 places