part2 update 70% finished

part2 update 70% finished