got line consolidation working properly