Latest works before leaving the project

It may has errors