Modifications based on recent changes discussed.