training: implement @dpmatthews changes