Commented out two functions