trimming back to 494 lines