yet more editing