YDWD-1 changes