Add guard and spork