LQE-206: In progress