Added remaining changes in c