perhaps not all of these 3000 line changes make sense?