updated yet more