Adjustments to the previous commit