Commented out the function calls