version 2 of the "swiglal" branch