fixed merge error
updated for new das sources