Update/Restructure 4.1