changed for multi-environment
added setting for linux