best241's modification of Spigot