Updated flow control #151