Added L2 checking and straight without payment