working on the formatting