More updates for new model