Work on rules, and payment pipeline changees