refine ... wip