should we have this enabled by default? Probably better that it is enabled only if needed.