The changes could come in by 2025