added combined history and updated atom config