Thanks for the advice MrMark
That is exactly what I did. Switched too 4”sqaure boxes with mud ring.
Pane in the *** to change all boxes out, but well worth it in the end.
The one box that I wired up for fit had a nick in the wire from trying to
Squeeze everything in, I’m happy that I found it...