Architecture 2

review 2