Reorder problems and make Problem 3 optional