Got rid of commented out section