wip -  several changes