finished dev for refresh feature