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