more updates
paper updates
merge