Changes in Model and UI for UI GUY to check