Modified for UI change