Eldar: fix perfomance issues