Make the auto watch thing optional