disabled auto-refresh, enabled manual-refresh and removed unused/commented code