SJA: a lot of updates without git but now we try to keep it clean with
the commits!