Updated for ELM WDs