Update demo to 2.5.0
Update again for 2.5.0