Updated for linux stability