Added a few func