class 6 updates with Ryan's solutions