Added auto selection