I had the structure correct before