wip
some changes