Cleaned up the gathering mechanism