Redesign project fix_2