Restructuring ability test after I changed firefigher? method