Add functions, still to be tested
Add functions, still to be tested