Simplify this bit of code... It was more complicated than needed.
This makes it clear whats really going on.  Still need to do it for "AUTO"
but its a start.