Architecture rewritten