minor adjustment
wip...