Final additions before merging.