minor modifications related to the previous commit