bit more work on models