Improves (very much!) the input management