changed model for new requirements