merge old commit
final paper changes