Added more selection gates