re-add some code deleted by github....