adapting new interface. Work in progress