Updated for UI refresh