swc and demo update