yet more importing old code into new 2