wip to solve #2