added history support