better style, added all relevant content