Propagator: incorporate review comments