Some adjustments to reply code.