Adds changes from Thursday session with Jeremy