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