Zlatina's commit