Added guard and Spork