Update with better format