Changed touch logic so there is no need to double tap