Upgrade parent to 25