refactoring. Add new model for testing.