More work on the C version