historycontroller updated, but no sure if correct