WIP: changes to test2