Safe commit, possible big changes coming