Yaniv changes

Same as before, try put the flag in one place reachable from any place.