updated for w2d2