added refresh, new sorting