Added some debugging ... + an ugly yield