Revised base model for HW6.