realized last patch was functional but bonkers, better fix here