Revision on architecture