added conditions for 'requesting' flag