Partial rework
I am an idiot