last changes, adding history and player