some progress on c3
some changes