Minor restructuring
History revived on error