Added option to disable beam