changes to kevin-moorer, added a few lines
another change
merging changes from origin