Updated for linux