master - NEW: more update, and refresh now