rewrote logic to use a non reactive collection as a intermediary client side