smart mode improvement