Update to hughsk master current