updated with correct environment-variable parser