rework into 497 workspace, nei dummy in place