some removes
repaired part1