Changed to use different model object