Antoi update

@jeremybarnes Can you review this so that we can merge + deploy?