Added function calls to complete