attempt 2: uncommenting stuff i just commented out