some stuff
paper stuff
merged