Changes to model for UI fixed.