Fixed clients feedback pp. 7-12