PR after fixed all issues and handle all responses