Should this still be optional?