UPDATING App architecture v2