Enforce history saving
Add comments