Modified files for version jb1 by Joe Butler