commiting a few func replacement