Update for linux - still untested though