Fixed restructure