upgraded auto word selection and control structures