progress update
merge changes