updated selection behaviour