Changes to fit merging with Patrik, this is info from swipeView