More progress on replacement C program