Fixed CR from Deepak