commented out some stuff. fingers crossed