Quick model changes, untested for now.