Traj Scan: changes made by RobW and ChrisC to make it work on I18