cleaned up code for DripHaigRedo_2