Shaw's next role was to lead the consolidated Boeing teams at Huntsville, Alabama, Canoga Park and Huntington Beach, California, in the design, development, test, evaluation, production and flight preparation of ISS hardware and software.