added history
fixed history