Changes as per davem instructions