forgot to remove code that are commented out