minor changes to chaining