minor modifications for the previous commit