fixed history and manage