new and improved formatting