Correct version of functions has been added.