LQE-253: some changes