wip
add improvements