Change to proper format