Finished mapping Problem 6