updating PR for the chaining issue