Added touchListener and locations