1st part of code change for flow control configuration