Daliy refactor