Change deferred vars to dfd