Updates on Jacques's code