Add PitForwarding Func, Fix bugs in State