Finish parts 3.1 and 3.2 sans mitigation