added spork and guard support