Hopefully the final structure change (crosses fingers lol)