Yeah the structure is a bit confusing now