Architectural Modification For