Refactored with NanoDAS instead of DAS