le work done, and fixed #1