Add Guard and finish ch3