Commented some functions
Merge branch 'jesus'