Added pre and post selection gates