refresh report rafactored