refactored, fixed reply section