pre-class commit 4/22