Commented out OnDraw() and R check at KS stage