further custom shop optimization and restructure