I think this would be better in the model