Added guard and spork