Revert again to Yair's version but Update inferred too