Updated doc from karsten