update Architecture for Ofri