refactoring
Merge branch 'UpsAlgorithm'