wip
merge and updates