Added checks for history