This change may be convoluted, but damn is it efficient!