Added guard
Added spork and live update