Slight optimization to Spiral