Updated to version C