C and H files updated(still not tested)