Fix for touch handler.
Design changes.