backup commit
Merge branch 'refactor-algorithms'
backup commit