MSE-3 : Small edits to the Client