Updated to rj-demo's options