updated for linux support