Update 2.0

So many multiple definition, still working to solve this issue.