Modified to allow spigot servers