review_model
resolved merge conflicts
Review changes