Added guard and spork functionality