Once again changed the model to be a tad more usable