wdi stuff (for now)