add content and better format