added input management