updated for W2D4