Final Elaphant changes.