Added touch functions and timeout