Problems 3 and 4 and cleaning up