Commit

Adjustment of functions