fixed some part in part 1