Updated code dealing with flush to make sure that we don't flush source and target when noflush is turned on. Making sure to not flush target if noflushtarget is turned on