Update based on Tigran's comments