Changes after talk to Tim