enhance flow control of includes per discussion