updated to new model