removing dejal and modernizing syntax