modified for test by H