refactored to regualr listview