Removed some instability: Now always refreshes on change