squashed the 3 commits all into 1
Merge branch 'redo_part_1'