wip: code changes with thomas