added proposed changes for C and leftovers