Gigi algo improvements.