Implemented better history