update 25 [Finishes #2518]