tweaking logic (wip)