updated and removed qdap dependency