Added option to turn on / off RAF