updated with pull-refresh