Preparing for future legal changes