Parial rollback
Minor refactoring