uncomment all the code for final version
Update documentation
??