Comments
Fixed duplicate function names