work to clean up and simplify auto selection