before Branch for redesign Modules