Perhaps make it optional?