Adjustments to previous commit