Adjustments to reflect current changes