before restructure 2