Improve notes...