class notes merged