First commit  proj2, ready and need testing
fix conflict