before architecture change