made some client polishing