model refactored
model refactored