Correct Fail and add way generators in