a few additional modifications