Changed for easier configuration