adapt to new model