Overhaul of model system