updated to current state
merge