wip: design improvment