updated the structure just a bit