Refactor, allow specifying on or off