fixed the if, N/A statements