MCH - update to get the app ready for store submission