gui update
merged