Updated function.h + function.cpp