partial commit v4, UI update