Some intermediate changes.