updated with better formatting for UI