merge these notes

I didn't do it right last time :100: