added history and started the fix