Continuation of rollback
Further refactoring