Added better way to environment