re-ordered saw components and added inclusion of cisst settings