Updated for stability