Replaced Slava's feature with the new implementation