Functions

More changes for functions