Client: Updated comments
Updated comments