Updating for gondor 1.2