before re-architecture