Modify some functions

-
Some revision

-