more trader progress, now distinguishes cases and only needs to react to proposals