Added condition 8 and 9.