I would move this after *notifyDataSetChanged* (2)