Work on functionDefinition, simplified some calls