Changes to Spout