no essential changes
commented out code pertinent to dashes and color