Finished new func
Progress
Fixed bug
Merge branch 'add-func'