Update based on feedback from Tigran