some additional modifications