Ok this seems to work