updated to track history