adding more info and structure