added a warning and got rid of unnecessary lines that were commented out