redone part 1