wip: some changes