Updated version now contains a switch