updated to follow all tokens returned by select