updated some retouched