MODIFIED config environment settings to be more efficient