can we move this to the model?