Updated with better formatting