Ver2.0.1 Add Guard & Spork (todo: resolve errors)