Update based on feedback from Tigran and Gerd