Added timer and keyboard