added history mgmt