Problems 1&2 updated