commented out code that was causing problems