Made changes to the way the base model works.