should be done with pset1 completely