Added function names to all functions