Cahnge condition to cater for 2.6.* and add notification