changed first conditional test.