revert some codes back