Merge Tomer work
Fix pointer events