changed logic for efficient processing. This needs to be pushed
this fix is for next release