Recovered some commented out functions