even more attempts at making CC happy