all working now I think