commented out unused parts, and one buggy part