Wrapped function and some swipeend improves