revert to origin & bugfix, starting re-merge