made mode autopick smarter