Resolved some problems after revert