Added some more conditions.