Do not run second update on failure
Added transactions
Autosort methods