adapting to new model