Changed optional function names to avoid type issues.