Modifed for UI changes