Moved boolean and / or to a flow controller