additions as per customer S. Klaus