Updated for linux support