Spigot changes