Some more structure and added info