Updated selectioner