Comiitng the fixes done by Lasantha for product CEP