Update for guard/spork