Completed functions and comments