CS630 shenanigans