removed djatoka dependency