Adjusted structure to newest loops