Enhanced the history a little bit