wip - improvements