New model pull request for code review

Again, looks like this could be cleaner. It seems only the `size` being used changes from one condition to the other.