Redoing basic-architecture