Some changes requested by Karin