addding waypoints and polish for listview