New updates

Same issue spent all day trying to figure out a solution.