Late commit of necessary changes for demo for the 'target' option.