Updated WFA to return complete answers