Spout update part 2