Extended to include line starters & terminators