Updates based on Giedrė feedback.