added commented out functions