UPDATE - trainer notes
Merge remote-tracking branch 'origin/part-1' into part-1