Update based on Thomas' comments