Updated for linux build