updates
trying again
OK finally working
Then tests