Brought up to date with current  class 8/29