added history stuff