hopefully final, class 9/30