fixed parsing, replaced non_workin instance_check with todo