Marc's adjustments
playing with GO-list