Continued work on Model