updated with reply feature and few more