history support WIP
compilation fix