Some additional modifications