Added addiitonal funciton arguments.