revamped with hammer js, work fine with swipe!!!!!