Made exchange drain optional
New version