Fixed clients feedback pp.1-6