separate from these changes, 
we put a flag intermediate in the context, any idea where is this flag used?