made update work
merged