First version
Some fixed