finished sys_refact