Added Option goodness to Roy demo.