Adding Flow Control