Getting rid of the old line class!