Update L1 and L2

Almost done with L2; missing the last part.