some lines commented out