Add notes
Adjust conversion