Added spork + guard