More testing to remove and add several lines..