merge with mzy, add one missing method, no conflict finally
Most of the methods to achieve