Giulio changes

should be either stream or global