errors correction after charlie's feedback