Update from moski's repo to hanxue's repo