ninja commit from ryan! Never safe rob, NEVER SAFE