Refactored and added replies
Merged