Added Yancy/Curtis stuff