wip
wip
wip
fix history and begin fields