added Uniquify + post-forward