Updated to match library in OpenSourceQuad