training: changes following @dpmatthews feedback