added pset6 + pset7