Added new functions. Modifications.