Safety Commit Part 2