Updated challenges 6 and 7