Updates Model

This time, for real!