additional modifications suggested by Heejung