we could land the current implementation that works, and then try to simplify if possible after