more changes wip