Redo code for SC004 to match SC020