tidied up selection