Added selection picking