Modified architecture 2