Update in relation to Uwe's comments