re-integrate bee updates into refactored form