Rolling out Avoid Bill 2.1