commented some hazardous code out