Removed 'touch' code as it doesn't work