made correction from tom pc
file merge