UPB -> Didnt like the resolution to the status update problem.  Revert Back for now