In class work and reorganizing p5