Added client and comments