WIP#2 on subs_demo changes