Redefine DS as a temporary measure