refactoring
merging conflicts
Merge pull request #63 from ChartKillers/KMSEdits2

Kms edits2