better support for various flock scenarios