This is with the duplication removed

Same as the others just cleaning the line1 messiness
removal of duplication