throwing this one in for good measure
scripted update of code from master at 0f55e00 throwing this one in for good measure