Now seems to be working