integrate flod's feedback