Reply info updated, code refactored