Updated functions and removed example functions