update based on feedback from Ingimar