new architecture

new architecture